GtkComboBox: Avoid GdkDeviceManager API
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 16 Dec 2015 18:23:25 +0000 (19:23 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Wed, 16 Dec 2015 18:47:06 +0000 (19:47 +0100)
We used to pick a master pointer "at random", use the default seat pointer
instead.

gtk/gtkcombobox.c

index a9dfba1ef5c135628d0b12b431e124aa34a917f6..d89e89cd05df145f1bde61974bb934faf8e49a51 100644 (file)
@@ -2310,17 +2310,11 @@ gtk_combo_box_real_popup (GtkComboBox *combo_box)
 
   if (!device)
     {
-      GdkDeviceManager *device_manager;
       GdkDisplay *display;
-      GList *devices;
-
-      display = gtk_widget_get_display (GTK_WIDGET (combo_box));
-      device_manager = gdk_display_get_device_manager (display);
 
       /* No device was set, pick the first master device */
-      devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-      device = devices->data;
-      g_list_free (devices);
+      display = gtk_widget_get_display (GTK_WIDGET (combo_box));
+      device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
     }
 
   gtk_combo_box_popup_for_device (combo_box, device);